Convert to use instance private data.

2006-01-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkpaned.c: Convert to use instance private data.

diff --git a/ChangeLog b/ChangeLog
index 711d382a3f49ba17b0054554abca49b03ce4c1ca..04353a8794fbd72eb34f2a01c5a8094cd56d3afd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-10  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkpaned.c: Convert to use instance private data.
+
 2006-01-10  Michael Natterer  <mitch@imendio.com>
 
        * gdk/gdkpango.c (on_renderer_display_closed): disconnect from the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 711d382a3f49ba17b0054554abca49b03ce4c1ca..04353a8794fbd72eb34f2a01c5a8094cd56d3afd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2006-01-10  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkpaned.c: Convert to use instance private data.
+
 2006-01-10  Michael Natterer  <mitch@imendio.com>
 
        * gdk/gdkpango.c (on_renderer_display_closed): disconnect from the

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 4bc20add00db9640bc2deba5d37dcafc841b11a9..a7f87f17a249076f03e9081cb850f3cf4122caa7 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -138,8 +138,8 @@ static GtkContainerClass *parent_class = NULL;
 struct _GtkPanedPrivate
 {
   GtkWidget *saved_focus;
-  GtkPaned *first_paned;
-  guint32 grab_time;
+  GtkPaned  *first_paned;
+  guint32    grab_time;
 };
 
 GType
@@ -467,6 +467,8 @@ gtk_paned_class_init (GtkPanedClass *class)
   add_move_binding (binding_set, GDK_KP_Home, 0, GTK_SCROLL_START);
   add_move_binding (binding_set, GDK_End, 0, GTK_SCROLL_END);
   add_move_binding (binding_set, GDK_KP_End, 0, GTK_SCROLL_END);
+
+  g_type_class_add_private (object_class, sizeof (GtkPanedPrivate));  
 }
 
 static GType
@@ -495,7 +497,7 @@ gtk_paned_init (GtkPaned *paned)
   paned->last_allocation = -1;
   paned->in_drag = FALSE;
 
-  paned->priv = g_new0 (GtkPanedPrivate, 1);
+  paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned, GTK_TYPE_PANED, GtkPanedPrivate);
   paned->last_child1_focus = NULL;
   paned->last_child2_focus = NULL;
   paned->in_recursion = FALSE;
@@ -646,8 +648,6 @@ gtk_paned_finalize (GObject *object)
   gtk_paned_set_saved_focus (paned, NULL);
   gtk_paned_set_first_paned (paned, NULL);
 
-  g_free (paned->priv);
-
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }